Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Apr 2010 22:47:31 +0000 (22:47 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 25 Apr 2010 22:47:31 +0000 (22:47 +0000)
commit200c60e1e4d5cb61c4c7f1d818a352271d747ad9
treedfb7a6948864a5631839ad1d3eb881f790698b60
parent70ea6ea7ec295498f235604ed15aa81723c3dc42
parentcd44ebad8458350fde36badce522c26d8c9de19b
Merge from mainline.